* admin/gitmerge.el (gitmerge-commit-message):

Exclude "skipped" messages from ChangeLog.

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 43773f5cb3538469c40a716756245f77da009382..c6a3446c1d52bef64ef4adbc078f4dde15750614 100644 (file)
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -314,7 +314,8 @@ Returns non-nil if conflicts remain."
 SKIP denotes whether those commits are actually skipped.  If END
 is nil, only the single commit BEG is merged."
   (with-temp-buffer
-    (insert "Merge from " branch "\n\n"
+    (insert (if skip "; " "")
+           "Merge from " branch "\n\n"
            (if skip
                (concat "The following commit"
                        (if end "s were " " was ")